autorun: change logic for ignoring volumes

Previously, a volume was being ignored from autorun if one of these two
conditions were met:
- its mount root file had a native scheme and was mounted in a
  non-hidden location
- it had a volume that could have been automounted, and had a flag set
  by the shell to allow autorun

In order to effectively ignore volumes that we don't mount ourselves
from our notification system, we have to meet both conditions at the
same time instead.

https://bugzilla.gnome.org/show_bug.cgi?id=660595

diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
index 9fbb26e53004f7c603e501cb29b4c83c5013f176..9d39690e98488b0b7b2ff7a800e450bfcdecdf45 100644 (file)
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -27,7 +27,7 @@ function ignoreAutorunForMount(mount) {
     let root = mount.get_root();
     let volume = mount.get_volume();
 
-    if ((root.is_native() && !isMountRootHidden(root)) ||
+    if ((root.is_native() && !isMountRootHidden(root)) &&
         (volume && volume.allowAutorun && volume.should_automount()))
         return false;